[mapper] fixes