Changes for compatibility on server

Changes for server