Tweaks needed to be able to build against go 1.1