Fix systemserver