Further assert message improvements