Improve asserts