Some small utility class rewrites