Fixes to default commands and mapper interface