Fix a couple of encoding issues

Created by  Eelco Dolstra  on October 24, 2016
V7UDCU3WQXXJLDJ7MP5QS6R6F5VD2NYV4FXEVSXG6ZCDOJUA7USQC
Change contents