Fix issues with homes