Fixed some more little things to satisfy pylint