Some cleanup in the aliases