Py23: Basic tweaks

Some basic tweaks.