Fix 0.10.x fix in serve setup