Fixing minor details