Some fixes for the new smoketest script (mostly style)