Add workarounds for gmcs