Fixing even more exploits