Grab bag of Fixes Part #2