More fixes in ajax/