Tweak to asserts