Minor changes for rust -master