Update to work with Go 1.2