Fixed semantic issue warnings