ATNA fixes