GMM and GUI hotfix