A few more fixes for compilation warnings