COMP: Fixing issue with shared libs on windows