Pyflakes warning fixes