ManualMapping fixes