Changes from AppCode.