Various fixes to lab deployment.