More minor fixes!