Random minor fixes