In testing found a few bugs with this set of patches, so there are a few version bumps in here to address the issues, along with two extra patches at the end to fix up some other issues I found in testing. Dave.