Fixing some CF issues