Tweaks/fixes to top-level processing