Some small fix for windows package