Mild Fixes.  Not completely working yet.