More salt 2014.1 compat fixes