Fix more asserts (WIP).