Removed (most) compilation warnings