Fixed a few shortcuts