More fixes in ajax/ and first in classes/