Fix issues with legacy lab