Fix for some issues before compilation process.
Small encoding fixes for compile process :)