Fixing a few minor issues