some fixes on A1