Better private settings handling in mackup