Two fixes on page references #17