Handle api-staging use in production
Fix compile errors - unclear why they are erroring, but Eclipse and JavaC concur