Minor changes related to 4.2