SPV small improvements