fixes a couple of things