fix some git analysis warnings

@gaurave, this fixes some analysis issues. I'm not 100% sure it's the correct fix -