attempting to fix cross-platform build issues