Making more atheme to viper changes.