CORS support for server removed, bugs