Small char ref fixes and pr-640 merged