Added Windows specific things