Hotfix for Page Builder compatibility
Hotfix for fullscreen mode when using Page Builder
Misc compatibility fixes