more rust changes