B-0 fixed a couple of more warnings found compiling in 32 bits mode