fix few shortcuts