Cleanup minor issues with client pkg
Fix APIOptions naming