Fixes w.r.t the comments on PR #55.