Fix generic states + salt cloud states