Two new functions and a fix to some old aliases.