Minor changes to avoid a few warnings