fixes for rust changes