Split local fixes to separate patches