Fixes, Again

More Mistakes Fixed