Fix submit issues