Fix two remaining python3 bugs.