Minor changes pending to be checked in