Added scalar/vector mix and fixed another bug in macs and macv