Fix flux & style