Clean up build warnings.
Fix issue where AVX function was called on SSE4.1 build.