Fix analyzer findings