Added a couple asserts