Minor modifications (no code change)