Fixes to module status calculation with ff enabled.