GMM fixes