Fixed issues with the build process in windows and linux