Add asserts where missing