add google and uncrate fixes