Pyflakes fixes