XML callouts syntax and other minor fixes