fix some Compatibility Issues