Tiny changes to match api server