some fixes in Editor