Small fixes for the pytest runner.