MS Windows behavior fixes