Fixing some minor details...