#6:
Small fixes