Also minor fixes