Fixed issues in GCM