Converter fixes and optimizations