Tweaks to make sample run with current FDB server