Missed these fixes to merge