Commit#99 language fixes