More fixes on deploy output