Revise issues mentioned on last merge.