Various small modifications