A few more fixes for running/reseting/rendering