Small fix and make ModularProgram use MainFunction
flakify