may not all be necessary, but this unbreaks things and we can revise later with okan@ and naddy@, ok okan@