A few changes with server compilation