Format and server fixes