Fixed more errors in the swap_vec_#DATA# subs