Minor fixes on lab machine.