Updates for Windows and modified srad benchmark