Added a few asserts