SimBuild fixes