Fix asserts