More adjustments to labdoo.make