Various small fixes/adjustments.