Put back some PP validation, as it does bigint magic