Some fixes for custom page=>zp core scripts