Issue #50 - CF10 fixes