Fixes for PyFlakes feedback