Similar fixes to 8.8 Image and 8.9 Table for bug 24070

https://www.w3.org/Bugs/Public/show_bug.cgi?id=24070