Assertion Errors Fixed