Fixed more encode errors