Fix analyzer errors