Page duplication fix, and minor commits.