Fix build analyzer errors