More deployment shenanigans