Fix PageBuilder issues