After submit to editor changes: Fix bugs