Fix minor analysis issues