Various small fixes

TBR