Improved C90 compatibility

C90 compatibility is not yet fully implemented