Fix two problems in AI2928

(ActionItem3116)