Ensure remaining hashes are translated Closes #6518