Fixes to SOF