Better handling of singleuser servers