Fixed some issues resulting from the massive pylint overhaul