New fixes
Merge https://github.com/mangtomas/unicc