Better JSONP handling