Fixes for Go interop.