Updated fixes from master.