Fixed up some issues with Edge editor