Fixes for trial edits