JSONWP compatibility fixes