Fix some rendering issues with certain types of content