Minor corrections to mv_source macro