Fixes that should go back into the master.