minor fixes for rust master