Fix issues with Apollo dependencies

People were reporting issues related to having issues with Apollo dependency, these changes will hopefully fix those issues.

Thanks to @boredland for putting the PR together.