fixing a couple of issues