6977-CAAERS , fixing build issues.