onepage generation fixes.