Fixes to server state and form.