Fixes on editwager