vera++ fixes