Misc changes
removed EXTENDED_KEYS