Slight mods for server