Updating to API; fixing build