APIClient fixes

Signed-off-by: Nick Brook <nick@akkroo.com>