Cleanup 377 branch commits

This branch fixes a couple of omissions in the #377 fix PR and in the #402 PR