Fixing CNFE, paths and such