Misc changes/fixes that have been sitting in my local tree