Please merge these fixes into next build