Fixing errors due to changes in Go lang.