Fixes on server