Add a few aliases from @robhruska