Fixed interop issues, that was simple