Some minor bug fixes to included gems
Some minor bug fixes to included gems

xuewenfei/jobsworth,xuewenfei/jobsworth,xuewenfei/jobsworth,ari/jobsworth,xuewenfei/jobsworth,ari/jobsworth,ari/jobsworth,ari/jobsworth