Yet more wip golang fixes