Some small fixes 

Most of them more or less cosmetic (avoiding compiler warnings)