Deploy improvements