Minor fixes for the CPA