Resolves several CustomerApi issues identified by back office build out.