Fix some rendering issues with overflows