Minor fixes until JSONP is working