Vector math 2 fixes