Minor fixes to USFM coding