Server arguments improvements