More Fixes (not final