various fixes on server