Changed implementation of fw shortcuts.