Fixes and security junk