Viper fixes