Minor fixes for issues resulting from recent architectural overhaul