Added more lab fixes.