Added a few more asserts