Fixed submission errors