Some small aesthetic fixes