Fixes for FF and MC