Fix missing assert
Code review updates