Minor Quat optimizations. Fixed scalar build.