More changes to suit Labwiki constraints