Checking in misc. changes from work machine.