Various small fixes ..