Some fixes to GCM module