Fixing ASSERT statement bugs