Fix some Assertion Failures