Made deploy tools more deployable