Some update for rust from master