Couple changes from the PyCharm inspector