Fixes for rust master