compatibility fixes for page builder and other minor updates