Last-minute server fixes