V0.8.5.2

Touch up some files. No code change.