Small fixes on server side