Ranger fixes