More minor fixes