Minor miscellaeneous fixes.