Fix builid with last [20140617] trunk