Adding latest salt stack tweaks