Further fixes to solve issues seen in editor