Batoto fixes and encoding support