Adding some improvements for users who use jetpack.