Merge these fixes