Forgot to wrap a few functions