fix a couple of things