Improve assertions