Fixes for CF9