More fixes for updated GLM