minor fixes for encoding, one exception
minor fixes for encoding, one exception

openaddresses/machine,slibby/machine,slibby/machine,slibby/machine,slibby/machine,openaddresses/machine,openaddresses/machine