More fixes of the first filein of Aida.