fix a couple more things