Fix issue warnings