More onepage generation fixes.