Server fork: minor changes