some small fixes to gcm extraction