Fixes that got lost