Final Fixes2