Some changes based on warnings.