SPV: Improve padding and interaction counts