Add shims for googlee support