More attempts to fix page build errors