Instoen: Fix a Few Bugs Identified by Jared

Fixes issues identified in discussion on a9bae32 and 6c1f32a