final fixes for test run of sbc