Various small fix