Various small adjustments.