Fix some mappings.
Fixes #191, #192, #189