Minor changes for consistency