Fix pl locale
Fix spec includes
Fix global leaks