Fixes to caf default.xml