More minor bugs