Minor fixes after running pyflakes