More fixes, this changes are needed for bigger C compatibility