Fix new site creation