boobot: More encoding fixes