Minor fixes, changed default mapping