SPV fixes