Fixed remaining asserts (2)