Minor changes for the ajax bugs