merged local fixes