Attempt to fix a few jetpack bugs