Fixing CF compatibilty issues