Fixes to facilitate some testing