Fixes for new redactor