Fixed minor windows runtime issues