Various changes to ensure webform submission is created properly.