PyFlakes fixes