Fixing a couple issues