Scripts improvements. GCM fixes