More CF10 Fixes