Some deployment fixes