Attempt to fix SPV padding under all circumstances.