Add: a few minor fixings.