Tweak to fix asserts.