[Upg] - Fixed issue with space shortcut, misc