Fixes for glitches found during testing