some fixes to make carbon work