More and more deploy fixes