misc. portability fixes

Conflicts:
	run/s7tojohn.py