Fix minor issues raised in #111 code review

Change-Id: Ibca25fea1d08e98271e68e3d4703afe5aeaae182