Fixed some bugs in the outputed JSONP objects