Minor changes which gets rid of all but two minor warnings.