some fixes for other platform builds