Add a couple more asserts