fix a few more fails that snuck in from a rebase