More fixes to magellan_keys