fixes for page2
mergefix