Try to fix page build issues