Minor fixes on server side