Minor changes based on post commit review: