handful of run-time fixes.