Slight alteration to some structures in drive wrt rvalue and move