COMP: Fixing issue with shared libraries on Windows