Fixes that got lost in the bad merge