[Post-Tutorial] Small OT pieces lost in the rebase

[ppannuto]

After the big rebase for #380, a few changes were lost. Per @tyler-potyondy's request, leaving as an issue here for him to address post-tutorial; these should not affect fundamental operation.