Fix GAC mangling