Attempt a few jetpack fixes