Made masterless and windows optional for salt