Few more minor changes for PR 12.