Small lab fixes

Random cleanup here and there.