Fixed Move-Related Functions To Match Data Types