Fixed more compilation warnings