Add: various minor fixings.