Fixes for T::Editor as requested by @sferik.