Py23: Basic tweaks