Some minor fixes on editor