Various small fixes: