fix a couple issues