CAF Merge Fixups

Signed-off-by Paul <javelinanddart@gmail.com>