More Flak8 fixes