Tweaked deploy scripts and config