Some python3 related changes