Replace a couple of missed functions with wrappers

Some tricksy functions escaped my wrath