PVlab - fixes