Fix (some of) all the things!