compatibility changes for server