Fix GCM dependencies
9 files changed