misc fixes while testing ofc and wkhtml