A fix here a fix there