Fix some white pages (WSoD) errors