Minor changes to compile on master.