Add missing use
Fix container bug
Fix encoding problems