warnings cleanup, partial instances, name overlaps