tweak some mappings