Minor tweaks; Support for manual testing.