Add fixes for non standard returns from google