Various small fixes and additions