Fixes some issues with the 4.4 submitOnce.