Updates for core-ajax and more tinkering around