Fixes for CNFE