Partial server dialog fixes.