Added some missing asserts