fix up a couple more things