Better Handling of MultiSite Settings and minor log modification