S4 fixup

This should hopefully fix the pool diff problem on S4.