Fixes for new glm