CR changes: fix typo and missing asserts