Small bug fixes plus added GCM service