BW6 hotfixes