Fixed lingering bugs related to switching to GLM.