commence fixes for linux build