More local fixes. This is why we have branches.