Minor fixes on server