Just some fixes for consistency