ENH: jail cleanup and fill in missing for 0.9