* Some small changes for asserts added