Minor fixes raised during PR review