Some updates for WFC