Fixes submission errors