Build fixes after moving to go1.4