Fix up a few spots for consistency