Changes to compile against current master.