Minor improvements, fixes #82