Minor fixes from PR