Updates following testing on clean machine.