Merge "Fix incorrect asserts"