Fix Shortcut Conflicts, Bug Fixes

See Changelog.txt Build 1155 - 1160 Changes