Fixes
Ready for Testing on Current Sites