Minor API cleanups