basic fixes for interoperability