Hotfixes for usability lab