A couple small fixes, particularly to fix the integration startup which one of my previous checkins causes to intermittently fail.