Fixed #157: Small adjustments.