[Make] Fixed non macOSX issues