More deployment fixes