Fix more exploits