Fixes from PyFlakes