Fixes from unity-stage since June/06