Minor changes from last merge