Add compatibility for Python 3.6: follow-up

This is a follow-up on !132 (merged) which fixes some stuff that I missed.

Merge request reports

Loading