Some changes to address warnings.