Fixed issues with the roommate settings