Fixes for pyflakes