More Go 1.0 build fixes
More Go 1.0 build fixes

infinity0/pond,ArneBab/pond,saltthefries/pond,sillvan/pond,ArneBab/pond,berkus/pond,agl/pond,berkus/pond,sillvan/pond,saltthefries/pond,ioerror/pond,agl/pond,ioerror/pond,infinity0/pond