Marked for FAT builds only, this is temporal
Fixed problems pointed by Code Analysis