Diverse Server-Fixes