Quick fixes for runinng in lab environment