Fix for pylint errors