Eliminate compile error/wraning from build and add optional support for ISO2022