Hotfix for fullscreen mode when using Page Builder
Misc compatibility fixes