Few fixes with homes and spawns