Fix analysis issues