Couple of minor fixes and steps towards payload cleanup.