Fixed submission bugs