Language Editor Fixes