Minor fixes

A couple what seem to be fixes assuming my assumptions are correct.

cc @mmalecki @Southern