Fixes for pylint and zsh