Windows compatibility (32 bit)+fix