Minor changes ...