Fixes for wfrc