Fix for some reasonable PyLint problems