A1: minor fixes