Fixes archive and marksheet submissions