Fix site creation & checkout