Fix esp packaging