Fixup issues with setting up the play services library