New annotation integrity, fixes for mapping hints