Code cleaning

Some int vs uint comparisons made explicit.