scafscaf fixes