Bug fixes on server