More API and Misc Fixes