More minor fixes..