The fixes needed fixin'