Windows warning cleanup