More fixes for compilation warnings