Fixes for pages