Stunbeam tweaks and fixes.