Fixes & tweaks for sample and hold accounting.