Escaping somethings for deploy as per @swcmorin #26005