Warning fixes

Fixes some warnings at compilation, minor stuff.
Why not use a conditional logical OR?