Various small adjustments