Fix warnings

mostly cosmetics