Try some workarounds for deploy script