Tidy up and fix burst submission