Minor changes in contexts