refs #218 - Removed override_settings for 1.3 compatibility
refs #218 - Nitpicks