Fixed some wkhtmltopdf problems with new format