Server call tweaks.