Window combat fixes.