Avoiding a few more compilation warnings