More minor nitpicks