More Fixes.  Long time off.