Some small bugfixes

A few things I ran into on the most recent rollup