Reduce warnings

Some patches to reduce warnings, as usual.