Fix simulator server headers and functions