Misc changes + bump api version.