fixes for negative identifiers