aliases and bug fixes