Fixes for 2 pages