Fixed c-support issues (I think...)