Server compatibility changes
Fixed merge conflicts