Various small improvements #64