Fix and speed up deployment