Fixed things from the previous screw up on the master.