Fix up some exploits