ana2: 11: fixes