fix minor analysis issues