Fix run bugs