Fix for 9331, 9216, 9396, 7882, 8566