Fixes to the SOP case study