Minor fix

See each commit logs for detail.