fixes for new rust