Mv/Cp fixes/spec