Fixed two remove editor related issues.