Small fixes based at #90