Changes for whalesong server compilation