fixing support of the x-send stuff
fixing issues with deploys