Avoid some warnings and a few cosmetic changes