more decoupling fixes
fix openchange depends