fix a couple problems with last commit