Fixed some bugs interop bugs.