Fix some rendering issues