Tweaks needed to be able to build against go 1.1

Was getting a couple of errors when trying to build; one was just a missing colon, the other was a function that didn't exist/couldn't be found.