Encoding and indent fixes