Make the content less totally broken