Small fixes for assert