Fixing a couple of issues