Server fixes and other small changes.