Cleaned up some setting defaults