Minor changes to remove warning messages