Fixes to assert