New modifications to make Windows happy