Improve EDITOR checks