Merge "py3: Miscellaneous fixes"