Change some aliases to make them work