SPO lab_2 small fixes