Changes to match with Page Object improvements.