hacks to buildstep
fixes