Fixes for Go 1.0