Sumission fixes