Revert payload behaviour; Several other minor fixes