Fixes on Site Migration