Minor changes from master