fix a couple more issues