Fixing minor problems