Small cleanups.
A couple of undefined functions.