small bugfixes for submission