More fixes for submit.