More minor-ish corrections