Trying to fix production launch issues