Correct errors showing up in demo.siteos.modules page call, plus other updates