More compilation warnings fixes