Add interop logging and minor cleanup