Fixed path issue and windows specific building