Update for Go 1.3