API update fix, and some changes to other files