Ensure everything gets submitted properly