Minor changes regarding encoding