Fix the jail stop and also add some alternatives.