Fixes for pylint