PyCharm changes - fixing misc