Translation optimizations
Fixed encoding issue