Fix two ATG semantic consistencies