fixes for migration to separate labs tool.