Fix scala build