Fixes and tweaks from run-through