Fixing minor issues