Minor changes to fix some warning messages