Fix backward compatibility issues for our dev server