FIX Salt problems