Fixes for breaking rust changes