Some API cleanups