Cleanup site config and some fixes