Update for latest go