Some deloy fixes