more APP-11 fixes