Mostly fix the problems (without addressing the root cause)