1. Various detail changes to remove some more warning with -w on