Quick modifications for go1.0.3 compatibility