More ajax fixes