API cleanups + fixes