Fix issue with circular dependancy
fix some export errors