Fixes to make happy the static analizer