Minor changes to master.