More MS Windows behavior fixes