more labisso fixes