various fixes and cleanup
interoperability cleanup