Fix some aliases