fix a couple bugs left behind