Add the few remaining trivial functions