Tweaks for apollo.